fix up regex matches in track discard filter.
authortsteven4 <tsteven4@gmail.com>
Tue, 10 Jun 2014 21:34:33 +0000 (21:34 +0000)
committertsteven4 <tsteven4@gmail.com>
Tue, 10 Jun 2014 21:34:33 +0000 (21:34 +0000)
gpsbabel/discard.cc

index 4b0cfa863b38d495e17a86e1f34240322bfcb5fd..6c0f68e037afb9eb15aa9124e2fd74aeae752015 100644 (file)
@@ -237,19 +237,23 @@ fix_init(const char* args)
 
   if (nameopt) {
     name_regex.setCaseSensitivity(Qt::CaseInsensitive);
+    name_regex.setPatternSyntax(QRegExp::WildcardUnix);
     name_regex.setPattern(nameopt);
   }
   if (descopt) {
     desc_regex.setCaseSensitivity(Qt::CaseInsensitive);
-    desc_regex.setPattern(nameopt);
+    desc_regex.setPatternSyntax(QRegExp::WildcardUnix);
+    desc_regex.setPattern(descopt);
   }
-  if (nameopt) {
-    name_regex.setCaseSensitivity(Qt::CaseInsensitive);
-    name_regex.setPattern(nameopt);
+  if (cmtopt) {
+    cmt_regex.setCaseSensitivity(Qt::CaseInsensitive);
+    cmt_regex.setPatternSyntax(QRegExp::WildcardUnix);
+    cmt_regex.setPattern(cmtopt);
   }
   if (iconopt) {
     icon_regex.setCaseSensitivity(Qt::CaseInsensitive);
-    icon_regex.setPattern(nameopt);
+    icon_regex.setPatternSyntax(QRegExp::WildcardUnix);
+    icon_regex.setPattern(iconopt);
   }
 }